auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 16:01:39 +0000 (17:01 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 16:01:39 +0000 (17:01 +0100)

Trivial merge